Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 27 May 2010 06:41:59 +0000 (06:41 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 27 May 2010 06:41:59 +0000 (06:41 +0000)

Trivial merge